Commit Graph

Select branches

Hide Pull Requests

dev-0524

dev-0524-1003

dev-0524-1212

dev-0624-yjm

dev-0703-0713

dev-0708-yjm

dev-0719-yjm

dev-0725-yjm

dev-0726-yjm

dev-0730-yjm

dev-0809-yjm

dev-0811-yjm

dev-0825-yjm

dev-0825Save

dev-0829-yjm

dev-0902-yjm

dev-0909-yjm

dev-0917-yjm

dev-0923-yjm

dev-0926-yjm

dev-0927-yjm

dev-0930-yjm

dev-1013

dev-1020-yjm

dev-1024-yjm

dev-1217

dev-1217-0703yjm

dev-1217-yjm0107

dev-1217-yjm0121

dev45-0117

dev45-0703NewVer

dev45-0706

dev45-0721_3

dev45-0809

dev45-0902-2

dev45-0904

dev45-0909

dev45-0909_2

dev45-0910

dev45-0919

dev45-0919_2

dev45-0922

dev45-0926

dev45-1007

dev45-1007_2

dev45-1010

dev45-1015

dev45-1017

dev45-1020

dev45-1022

dev45-1024

dev45-1110

dev45-gjf0715

devGjf-0520

devgjf-0628

gjf-1217

master

#1

#10

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#114

#115

#116

#117

#118

#119

#12

#120

#121

#122

#123

#124

#125

#126

#127

#128

#129

#13

#130

#131

#132

#133

#134

#135

#136

#137

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#154

#155

#156

#157

#158

#159

#16

#160

#161

#162

#163

#164

#165

#166

#167

#168

#169

#17

#170

#171

#172

#173

#174

#175

#176

#177

#178

#179

#18

#180

#181

#182

#183

#184

#185

#186

#187

#188

#189

#19

#190

#191

#192

#193

#194

#195

#196

#197

#198

#199

#2

#20

#200

#201

#202

#203

#204

#205

#206

#207

#208

#209

#21

#210

#211

#212

#213

#214

#215

#216

#217

#218

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#93

#94

#95

#96

#97

#98

#99

checkIfPRContentChanged-1718088198349323294/dev-0524

checkIfPRContentChanged-1718088198349323294/dev-0524-test

checkIfPRContentChanged-1718088198349323294/dev-0530

checkIfPRContentChanged-1718088198349323294/dev-0604

checkIfPRContentChanged-1718088198349323294/dev-0611

checkIfPRContentChanged-1718088198349323294/master

checkIfPRContentChanged-1718088198349323294/test_master_2

checkIfPRContentChanged-1718088198349323294/tmp_dev-0524

checkIfPRContentChanged-1752730301603610417/dev-0524

checkIfPRContentChanged-1752730301603610417/dev-0524-1003

checkIfPRContentChanged-1752730301603610417/dev-0524-1212

checkIfPRContentChanged-1752730301603610417/dev-0624-yjm

checkIfPRContentChanged-1752730301603610417/dev-0703-0713

checkIfPRContentChanged-1752730301603610417/dev-0708-yjm

checkIfPRContentChanged-1752730301603610417/dev-1217

checkIfPRContentChanged-1752730301603610417/dev-1217-0703yjm

checkIfPRContentChanged-1752730301603610417/dev-1217-yjm0107

checkIfPRContentChanged-1752730301603610417/dev-1217-yjm0121

checkIfPRContentChanged-1752730301603610417/dev45-0117

checkIfPRContentChanged-1752730301603610417/dev45-0626

checkIfPRContentChanged-1752730301603610417/dev45-0703NewVer

checkIfPRContentChanged-1752730301603610417/dev45-0705

checkIfPRContentChanged-1752730301603610417/dev45-0706

checkIfPRContentChanged-1752730301603610417/dev45-0708

checkIfPRContentChanged-1752730301603610417/dev45-0714

checkIfPRContentChanged-1752730301603610417/dev45-gjf0715

checkIfPRContentChanged-1752730301603610417/devGjf-0520

checkIfPRContentChanged-1752730301603610417/devgjf-0628

checkIfPRContentChanged-1752730301603610417/gjf-1217

checkIfPRContentChanged-1752730301603610417/master

checkIfPRContentChanged-1752730301603610417/tmp_dev45-0703NewVer

checkIfPRContentChanged-1753429692420322192/dev-0524

checkIfPRContentChanged-1753429692420322192/dev-0524-1003

checkIfPRContentChanged-1753429692420322192/dev-0524-1212

checkIfPRContentChanged-1753429692420322192/dev-0624-yjm

checkIfPRContentChanged-1753429692420322192/dev-0703-0713

checkIfPRContentChanged-1753429692420322192/dev-0708-yjm

checkIfPRContentChanged-1753429692420322192/dev-0719-yjm

checkIfPRContentChanged-1753429692420322192/dev-0725-yjm

checkIfPRContentChanged-1753429692420322192/dev-1217

checkIfPRContentChanged-1753429692420322192/dev-1217-0703yjm

checkIfPRContentChanged-1753429692420322192/dev-1217-yjm0107

checkIfPRContentChanged-1753429692420322192/dev-1217-yjm0121

checkIfPRContentChanged-1753429692420322192/dev45-0117

checkIfPRContentChanged-1753429692420322192/dev45-0703NewVer

checkIfPRContentChanged-1753429692420322192/dev45-0706

checkIfPRContentChanged-1753429692420322192/dev45-0714

checkIfPRContentChanged-1753429692420322192/dev45-0717

checkIfPRContentChanged-1753429692420322192/dev45-0719

checkIfPRContentChanged-1753429692420322192/dev45-0721

checkIfPRContentChanged-1753429692420322192/dev45-0721_3

checkIfPRContentChanged-1753429692420322192/dev45-0722

checkIfPRContentChanged-1753429692420322192/dev45-gjf0715

checkIfPRContentChanged-1753429692420322192/devGjf-0520

checkIfPRContentChanged-1753429692420322192/devgjf-0628

checkIfPRContentChanged-1753429692420322192/gjf-1217

checkIfPRContentChanged-1753429692420322192/master

checkIfPRContentChanged-1753429692420322192/tmp_dev45-0703NewVer

Mono Color

• 200445f287 更新1215 dev45-1110 45 2025-12-15 22:29:20 +0800
• aaae5ece57 1215 45 2025-12-15 11:29:11 +0800
• 096c618839 1205同步 45 2025-12-05 15:18:13 +0800
• 4127b792e6 bug修复 dev45-0703NewVer yjm484 2025-10-30 14:33:09 +0800
• 7e3499d54b bug修理1027 dev45-1024 45 2025-10-27 12:18:42 +0800
• aa8414a1a7 bug修正 yjm484 2025-10-25 01:57:00 +0800
• bcbf1a0b2d Merge pull request '1024提交' (#218) from dev-1024-yjm into dev45-0703NewVer yjm484 2025-10-24 01:23:02 +0800
• 946269722b 1024提交 #218 #217 dev-1024-yjm yjm484 2025-10-24 01:20:35 +0800
• b7e59db664 Merge pull request '动效bug修理1022' (#216) from dev45-1021 into dev45-0703NewVer dev45-1022 45 2025-10-22 13:40:14 +0800
• 21f0b1ca42 动效bug修理1022 #216 45 2025-10-22 13:39:13 +0800
• 31d9ac8da7 Merge pull request 'uibug修理1022' (#215) from dev45-1017 into dev45-0703NewVer 45 2025-10-22 13:32:40 +0800
• 419b371ed6 冲突合并 #215 dev45-1017 45 2025-10-22 13:22:49 +0800
• 2483025ddf uibug修理1022 45 2025-10-22 13:16:09 +0800
• 480f77a18f 调整一下炸弹的数值2 yjm484 2025-10-21 01:49:49 +0800
• fb8e835842 调整一下炸弹的数值 yjm484 2025-10-21 01:38:21 +0800
• 9f204fbd8c Merge pull request '1020提交' (#214) from dev-1020-yjm into dev45-0703NewVer yjm484 2025-10-20 16:44:52 +0800
• ee70cf726b Merge branch 'dev45-0703NewVer' into dev-1020-yjm #214 dev-1020-yjm yjm484 2025-10-20 16:42:12 +0800
• 5249648bf3 1020提交 yjm484 2025-10-20 16:33:57 +0800
• e2c627d8ce Merge pull request 'dev45-1017' (#213) from dev45-1017 into dev45-0703NewVer dev45-1020 45 2025-10-20 14:26:40 +0800
• fc6cf4b820 uibug修理，地块形状更改 #213 45 2025-10-20 14:25:56 +0800
• 0fa600601c 地块形状改变1017 45 2025-10-17 16:50:36 +0800
• 92d4bec72a Merge pull request '开包分数动效1015' (#212) from dev45-1015 into dev45-0703NewVer 45 2025-10-17 15:40:30 +0800
• 2a0af6bdc2 开包分数动效1015 #212 dev45-1015 45 2025-10-15 12:28:33 +0800
• 0254744436 1015同步 dev45-1010 45 2025-10-15 09:47:00 +0800
• 0fbf11b75b bugfix yjm484 2025-10-14 14:24:28 +0800
• 4dcb686f22 bug修复 yjm484 2025-10-14 12:15:45 +0800
• db1f909e94 bug修复 yjm484 2025-10-14 12:02:00 +0800
• b677b2cfd8 Merge pull request 'dev45-1010' (#211) from dev45-1010 into dev45-0703NewVer 45 2025-10-13 23:33:48 +0800
• 160409d5d0 冲突合并1013 #211 #210 #209 45 2025-10-13 23:30:55 +0800
• a6d3b145ed 特效替换1013 45 2025-10-13 23:26:25 +0800
• 7ff7ac24b6 bug修复 yjm484 2025-10-13 16:21:30 +0800
• 3fdb3974f5 Merge pull request '1013提交' (#208) from dev-1013 into dev45-0703NewVer yjm484 2025-10-13 16:07:46 +0800
• d85fc7a53b 1013提交 #208 dev-1013 yjm484 2025-10-13 16:04:40 +0800
• c01aa1df22 1011地块信息 软件204张景程 2025-10-11 10:31:40 +0800
• 0dbb6114ac Merge pull request '修理漏洞1010' (#207) from dev45-1007_2 into dev45-0703NewVer 45 2025-10-10 10:18:18 +0800
• 5d1db8c5f0 修理漏洞1010 #207 dev45-1007_2 软件204张景程 2025-10-10 10:17:31 +0800
• 9643984404 Merge pull request '1010提交' (#206) from dev-0930-yjm into dev45-0703NewVer yjm484 2025-10-10 03:16:19 +0800
• 974610bc11 Merge branch 'dev45-0703NewVer' into dev-0930-yjm #206 dev-0930-yjm yjm484 2025-10-10 03:15:42 +0800
• f3b06c7ae7 1010提交 yjm484 2025-10-10 03:14:50 +0800
• cae1b4d29f Merge pull request '1007动效' (#205) from dev45-1007 into dev45-0703NewVer 45 2025-10-07 16:11:01 +0800
• 3c055f220e 1007动效 #205 dev45-1007 软件204张景程 2025-10-07 16:09:45 +0800
• c0af119b7b Merge pull request '0930提交' (#204) from dev-0930-yjm into dev45-0703NewVer yjm484 2025-09-30 17:15:39 +0800
• 387c4b9692 0930提交 #204 yjm484 2025-09-30 17:11:02 +0800
• 86936f5c89 Merge pull request '0928锻造' (#203) from dev45-0926 into dev45-0703NewVer 45 2025-09-28 14:39:34 +0800
• 653f5334a1 Merge pull request 'dev-0927-yjm' (#202) from dev-0927-yjm into dev45-0703NewVer yjm484 2025-09-28 14:38:28 +0800
• 802e65f989 0928锻造 #203 dev45-0926 软件204张景程 2025-09-28 14:37:46 +0800
• cfe1afacdf unitask改动 #202 dev-0927-yjm yjm484 2025-09-28 14:13:13 +0800
• e2092cb57c 0927尝试 yjm484 2025-09-27 03:07:26 +0800
• 6ee3b8d270 Merge pull request '0925流程修理' (#201) from dev45-0919_2 into dev45-0703NewVer 45 2025-09-26 16:45:20 +0800
• b7f1230062 0926冲突合并 #201 dev45-0919_2 软件204张景程 2025-09-26 15:41:36 +0800
• 69c528e2f3 Merge pull request '0926提交' (#200) from dev-0926-yjm into dev45-0703NewVer yjm484 2025-09-26 15:55:54 +0800
• 8bc2660ba0 0926提交 #200 dev-0926-yjm yjm484 2025-09-26 15:54:48 +0800
• 40b5a14e91 0925流程修理 45 2025-09-25 19:21:53 +0800
• b923a79a46 Merge pull request '0923提交' (#199) from dev-0923-yjm into dev45-0703NewVer yjm484 2025-09-23 14:42:47 +0800
• ca56b6061e Merge remote-tracking branch 'origin/dev45-0703NewVer' into dev-0923-yjm #199 dev-0923-yjm yjm484 2025-09-23 14:42:05 +0800
• 24af09a36f 0923提交 yjm484 2025-09-23 14:35:40 +0800
• 8b84c5c8d9 Merge pull request 'dev45-0919_2' (#198) from dev45-0919_2 into dev45-0703NewVer dev45-0922 45 2025-09-22 18:18:54 +0800
• 5455495e2e ui替换0922 #198 45 2025-09-22 18:17:04 +0800
• 7e711ecee0 0919地图刷新机制修改 软件204张景程 2025-09-19 20:39:44 +0800
• a3be89c54e Merge pull request '0919锻造修理' (#197) from dev45-0919 into dev45-0703NewVer 45 2025-09-19 19:30:26 +0800
• 722c41e11b 0919锻造修理 #197 dev45-0919 软件204张景程 2025-09-19 19:29:32 +0800
• 5d4bff354c bug修复 yjm484 2025-09-19 16:03:02 +0800
• 8f47421351 Merge pull request 'dev45-0910' (#196) from dev45-0910 into dev45-0703NewVer 45 2025-09-19 15:46:33 +0800
• 2906f29db3 数据同步0919 #196 dev45-0910 软件204张景程 2025-09-19 15:45:26 +0800
• e0ddb60ed9 0918提交 45 2025-09-18 15:07:29 +0800
• 738cb74b3c bug修复 yjm484 2025-09-18 13:05:26 +0800
• f6c2def8df Merge pull request '0917提交' (#195) from dev-0917-yjm into dev45-0703NewVer yjm484 2025-09-17 12:37:20 +0800
• bb605c356b 0917提交 #195 dev-0917-yjm yjm484 2025-09-17 12:35:51 +0800
• 9e50ca5d8d 0911锻造系统重构 45 2025-09-11 18:47:53 +0800
• 9d37ff10ad Merge pull request '0910锻造系统留档' (#194) from dev45-0909_2 into dev45-0703NewVer 45 2025-09-10 12:24:38 +0800
• 2f43b86167 0910锻造系统留档 #194 dev45-0909_2 45 2025-09-10 12:23:26 +0800
• c8d2403be9 Merge pull request '0909合并bug修理' (#193) from dev45-0909 into dev45-0703NewVer 45 2025-09-09 15:15:04 +0800
• 56a095e396 0909合并bug修理 #193 dev45-0909 45 2025-09-09 15:14:33 +0800
• fb8d12821f Merge pull request 'dev45-0904' (#192) from dev45-0904 into dev45-0703NewVer 45 2025-09-09 14:47:40 +0800
• c0dc41f79e 0909bug修理 #192 dev45-0904 45 2025-09-09 14:38:44 +0800
• 7d01659e9c Merge pull request '0909提交' (#191) from dev-0909-yjm into dev45-0703NewVer yjm484 2025-09-09 14:23:24 +0800
• 888e89e0b1 0909提交 #191 dev-0909-yjm yjm484 2025-09-09 14:20:58 +0800
• f9f4cf1653 0907bug修理 45 2025-09-07 12:56:20 +0800
• 46666b9daf Merge pull request '优化0904' (#190) from dev45-0902-2 into dev45-0703NewVer 45 2025-09-04 14:25:08 +0800
• a5264e2fde 冲突合并0904 #190 dev45-0902-2 45 2025-09-04 14:24:03 +0800
• 40b88e6e34 优化0904 45 2025-09-04 14:16:45 +0800
• 1c5b8524b5 0903提交 yjm484 2025-09-03 17:46:05 +0800
• d31feb0cec bug修复 yjm484 2025-09-02 20:13:34 +0800
• cc99e5b672 Merge pull request '合并修理0902' (#189) from dev45-0902 into dev45-0703NewVer 45 2025-09-02 16:03:22 +0800
• 1298ea8f89 合并修理0902 #189 45 2025-09-02 15:57:05 +0800
• 999aed3ad5 Merge pull request 'ui替换0920' (#188) from dev45-0825 into dev45-0703NewVer 45 2025-09-02 14:38:55 +0800
• 2b1165eace 冲突合并0902 #188 45 2025-09-02 14:16:56 +0800
• 51cf93547d ui替换0920 45 2025-09-02 13:47:59 +0800
• 0c37d7533f Merge pull request 'dev-0902-yjm' (#187) from dev-0902-yjm into dev45-0703NewVer yjm484 2025-09-02 08:02:35 +0800
• 0bff0d29cf Merge branch 'dev45-0703NewVer' into dev-0902-yjm #187 #186 #185 #184 dev-0902-yjm yjm484 2025-09-02 08:00:56 +0800
• fcad90447c 删除图片 yjm484 2025-09-02 08:00:29 +0800
• 1cfd1fbabd 0902提交 yjm484 2025-09-02 07:58:55 +0800
• 9959658f0d Merge pull request '0829提交' (#183) from dev-0829-yjm into dev45-0703NewVer yjm484 2025-08-29 06:11:14 +0800
• e190369f4f 修改冲突 #183 dev-0829-yjm yjm484 2025-08-29 06:10:59 +0800
• b6f186da12 0829提交 yjm484 2025-08-29 06:04:07 +0800
• dbf3f2d9dc 0825合并修理 dev-0825Save 45 2025-08-25 16:43:51 +0800
• 0d7378a447 Merge pull request '0825提交' (#182) from dev-0825-yjm into dev45-0703NewVer yjm484 2025-08-25 13:32:28 +0800
• 1c417fa5a5 Merge branch 'dev45-0703NewVer' into dev-0825-yjm #182 dev-0825-yjm yjm484 2025-08-25 13:31:29 +0800
• 01a57fb973 0825提交 yjm484 2025-08-25 13:30:40 +0800
• 0c50262ab1 Merge pull request '背包优化0824' (#181) from dev45-0821_2 into dev45-0703NewVer 45 2025-08-24 21:16:26 +0800