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

• 0d5c36a47c 背包优化0824 #181 45 2025-08-24 18:54:18 +0800
• 6066e58695 Merge pull request '信息弹窗优化0821' (#180) from dev45-0812 into dev45-0703NewVer 45 2025-08-21 14:33:15 +0800
• 7ce3479e1a 信息弹窗优化0821 #180 45 2025-08-21 14:32:31 +0800
• 0817726188 Merge pull request 'dev45-0812' (#179) from dev45-0812 into dev45-0703NewVer 45 2025-08-20 19:17:44 +0800
• 74de3c5476 背包系统0820 #179 45 2025-08-20 19:15:22 +0800
• 13339e1bfb 死循环bug修复 yjm484 2025-08-19 03:17:15 +0800
• e6690ec563 武器附魔特效0818 45 2025-08-18 11:51:36 +0800
• eb9c25f02f Merge pull request '武器附魔三选0812' (#178) from dev45-0812 into dev45-0703NewVer 45 2025-08-12 17:39:04 +0800
• 90d726fd4d 武器附魔三选0812 #178 45 2025-08-12 17:24:45 +0800
• 862f66a387 Merge pull request '地块转换特效0812' (#177) from dev45-0811_3 into dev45-0703NewVer 45 2025-08-12 15:16:21 +0800
• 5c78ad841c 地块转换特效0812 #177 45 2025-08-12 15:14:43 +0800
• e5e2586d3f 更复杂的获取宝石 yjm484 2025-08-12 03:51:12 +0800
• c39a43c3c3 字体修复0811 45 2025-08-11 21:54:45 +0800
• 634c288b3f Merge pull request 'bug修改0811' (#176) from dev45-0811_2 into dev45-0703NewVer 45 2025-08-11 21:52:06 +0800
• 67389b550c 合并冲突0811_2 #176 45 2025-08-11 21:51:34 +0800
• a25314d098 bug修改0811 45 2025-08-11 21:48:32 +0800
• e741d2f5c2 随机怪物 yjm484 2025-08-11 15:36:05 +0800
• ed6ba0fa87 Merge pull request '敌人卡牌生成修改0811' (#175) from dev45-0811_2 into dev45-0703NewVer 45 2025-08-11 13:36:48 +0800
• 6f876b3e29 敌人卡牌生成修改0811 #175 45 2025-08-11 13:36:18 +0800
• ea0a387799 Merge pull request '地图历史0811' (#174) from dev45-0730 into dev45-0703NewVer 45 2025-08-11 13:20:00 +0800
• 4e1fa62dff 合并冲突0811 #174 45 2025-08-11 13:18:34 +0800
• e548d21309 地图历史0811 45 2025-08-11 12:31:59 +0800
• 32605690e2 Merge pull request '0811提交' (#173) from dev-0811-yjm into dev45-0703NewVer yjm484 2025-08-11 03:15:15 +0800
• 127dbe4c10 0811提交 #173 #172 dev-0811-yjm yjm484 2025-08-11 03:12:21 +0800
• f91e9f21d9 Merge pull request 'dev45-0730' (#171) from dev45-0730 into dev45-0703NewVer dev45-0809 45 2025-08-09 17:17:32 +0800
• 922e3ad945 冲突合并修改0809 #171 #170 45 2025-08-09 17:14:55 +0800
• d2314a0443 合并冲突0809 45 2025-08-09 17:05:00 +0800
• 34f1acfd4e Merge pull request '0809提交' (#169) from dev-0809-yjm into dev45-0703NewVer 45 2025-08-09 16:20:41 +0800
• 0969665896 0809提交 #169 #168 dev-0809-yjm yjm484 2025-08-09 12:23:24 +0800
• a74921cd47 新版地图0808 45 2025-08-08 20:51:51 +0800
• 5bb18e7a30 地图场景统合0806 45 2025-08-06 20:12:27 +0800
• 1c5dad37b2 敌人卡组ui0804 45 2025-08-04 11:14:44 +0800
• 0af8a81c67 领域边界0801 45 2025-08-01 18:32:26 +0800
• ba4ed78287 Merge pull request '合并优化0730' (#167) from dev45-0730 into dev45-0703NewVer 45 2025-07-30 20:00:17 +0800
• c3d53488a4 合并优化0730 #167 45 2025-07-30 19:52:11 +0800
• d7d1c89ea1 Merge pull request 'dev45-0726_2' (#166) from dev45-0726_2 into dev45-0703NewVer 45 2025-07-30 19:18:37 +0800
• dc05bbb437 合并修理0730 #166 45 2025-07-30 19:13:02 +0800
• 227bf1df8e 合并冲突0730 45 2025-07-30 19:04:31 +0800
• bbdebbd0ba 优化0730 45 2025-07-30 18:44:31 +0800
• 754d4721bb Merge pull request '0730提交' (#165) from dev-0730-yjm into dev45-0703NewVer yjm484 2025-07-30 17:45:10 +0800
• f507769c3b 0730提交 #165 dev-0730-yjm yjm484 2025-07-30 17:41:49 +0800
• ee49f0ab9a 0729 dev45-gjf0715 Dencer 2025-07-29 15:34:42 +0800
• 3a08f0c56d 选牌框架0728 45 2025-07-28 19:37:46 +0800
• 32b36f2274 设置ui修改0726 45 2025-07-26 20:24:18 +0800
• 417b63b57a Merge pull request 'dev45-0725' (#164) from dev45-0725 into dev45-0703NewVer 45 2025-07-26 19:02:02 +0800
• b3f1179928 报错修改0726 #164 #163 45 2025-07-26 19:01:01 +0800
• 57711bd9dc 冲突合并0726 45 2025-07-26 18:56:44 +0800
• a925e09418 ui修改0726 45 2025-07-26 18:49:20 +0800
• 4fcc1f7cc9 Merge pull request '0726提交' (#162) from dev-0726-yjm into dev45-0703NewVer yjm484 2025-07-26 18:45:56 +0800
• 3a6f0ab8c7 0726提交 #162 #161 dev-0726-yjm yjm484 2025-07-26 18:42:10 +0800
• 258944809e 地图修缮0725 45 2025-07-25 19:38:08 +0800
• 9a6c74fbda Merge pull request 'dev45-0722' (#160) from dev45-0722 into dev45-0703NewVer 45 2025-07-25 15:57:59 +0800
• 7592e55d72 冲突合并0725 checkIfPRContentChanged-1753429692420322192/dev45-0722 #160 45 2025-07-25 15:48:04 +0800
• c10a4a51ca ui修改0725 #159 45 2025-07-25 15:35:43 +0800
• 571bda2420 Merge pull request '0725提交' (#158) from dev-0725-yjm into dev45-0703NewVer checkIfPRContentChanged-1753429692420322192/tmp_dev45-0703NewVer checkIfPRContentChanged-1753429692420322192/dev45-0703NewVer yjm484 2025-07-25 13:26:29 +0800
• c8d1bc2030 0725提交 checkIfPRContentChanged-1753429692420322192/dev-0725-yjm #158 dev-0725-yjm yjm484 2025-07-25 13:14:20 +0800
• a04be9ed24 ui0723 45 2025-07-23 21:10:51 +0800
• edab823cd1 Merge pull request 'dev45-0721' (#157) from dev45-0721 into dev45-0703NewVer 45 2025-07-22 13:43:17 +0800
• 1ab195f7db 合并冲突0722 checkIfPRContentChanged-1753429692420322192/dev45-0721 #157 45 2025-07-22 13:41:52 +0800
• 78ea7e7e2b Merge pull request 'dev-0719-yjm' (#155) from dev-0719-yjm into dev45-0703NewVer yjm484 2025-07-21 21:23:08 +0800
• 4cbfab731c Merge branch 'dev45-0703NewVer' into master master checkIfPRContentChanged-1753429692420322192/master yjm484 2025-07-21 21:19:58 +0800
• 1209f06ff9 Revert "解决冲突" checkIfPRContentChanged-1753429692420322192/dev-0719-yjm #155 #154 #150 dev-0719-yjm yjm484 2025-07-21 21:09:51 +0800
• a2532d0cf0 Merge pull request '特效替换0721' (#152) from dev45-0721 into dev45-0703NewVer checkIfPRContentChanged-1753429692420322192/dev45-0721_3 dev45-0721_3 45 2025-07-21 18:20:06 +0800
• a4bf02bcef 特效替换0721 #156 #152 45 2025-07-21 18:09:32 +0800
• 936ef9eff8 Merge pull request '0721提交' (#151) from dev-0719-yjm into dev45-0703NewVer yjm484 2025-07-21 17:56:43 +0800
• c8de9a47a8 解决冲突 #151 yjm484 2025-07-21 17:56:19 +0800
• 1302e2f0e3 0721提交 yjm484 2025-07-21 17:35:44 +0800
• f85100b89d Merge pull request 'dev45-0719' (#149) from dev45-0719 into dev45-0703NewVer 45 2025-07-21 11:41:25 +0800
• d8c0e46fac 0721提交 checkIfPRContentChanged-1753429692420322192/dev45-0719 #149 45 2025-07-21 11:36:37 +0800
• 10e07ca8dc 涂色预览更改0720 45 2025-07-20 20:39:06 +0800
• aa9c59b455 Merge pull request '主场景ui替换0719' (#148) from dev45-0717 into dev45-0703NewVer 45 2025-07-19 22:45:54 +0800
• d8cee952f7 冲突合并0719 checkIfPRContentChanged-1753429692420322192/dev45-0717 #148 45 2025-07-19 22:36:55 +0800
• 95d6f20ba3 主场景ui替换0719 45 2025-07-19 19:41:50 +0800
• d8f01679a1 Merge pull request '0719提交' (#147) from dev-0719-yjm into dev45-0703NewVer yjm484 2025-07-19 05:18:38 +0800
• bd85f517b6 修复冲突 #147 yjm484 2025-07-19 05:18:22 +0800
• e4d0d9e9a3 0719提交 yjm484 2025-07-19 05:11:08 +0800
• 02e520cb1e Merge pull request 'dev45-0714' (#146) from dev45-0714 into dev45-0703NewVer 45 2025-07-17 13:39:25 +0800
• 9dec7cd726 Merge branch 'dev45-0703NewVer' into dev45-0714 checkIfPRContentChanged-1753429692420322192/dev45-0714 checkIfPRContentChanged-1752730301603610417/dev45-0714 #146 45 2025-07-17 13:31:39 +0800
• cac4125e3a ui修改0717 #145 45 2025-07-17 13:14:28 +0800
• a643414cad ui调整0714 45 2025-07-14 21:09:54 +0800
• 6397dd018c 删除费用 checkIfPRContentChanged-1753429692420322192/dev45-gjf0715 checkIfPRContentChanged-1752730301603610417/tmp_dev45-0703NewVer checkIfPRContentChanged-1752730301603610417/dev45-gjf0715 checkIfPRContentChanged-1752730301603610417/dev45-0703NewVer yjm484 2025-07-14 16:40:54 +0800
• de06d152c5 Merge pull request 'dev45-0708' (#144) from dev45-0708 into dev45-0703NewVer 45 2025-07-14 15:48:58 +0800
• 6b78f68b71 合并冲突0714 checkIfPRContentChanged-1752730301603610417/dev45-0708 #144 45 2025-07-14 15:46:34 +0800
• f6236f4294 ui修改0714 45 2025-07-14 15:25:05 +0800
• 0fa1dbf266 Merge pull request '0713提交' (#143) from dev-0703-0713 into dev45-0703NewVer yjm484 2025-07-13 16:48:25 +0800
• 8c062d9fd0 0713提交 checkIfPRContentChanged-1753429692420322192/dev-0703-0713 checkIfPRContentChanged-1752730301603610417/dev-0703-0713 #143 dev-0703-0713 yjm484 2025-07-13 16:47:16 +0800
• 6b77753262 ui修改0713 45 2025-07-13 14:15:33 +0800
• d51024a512 地形0711 45 2025-07-11 22:06:36 +0800
• 666954867b 开始节点0710 45 2025-07-10 18:10:01 +0800
• d2c3320ee5 0710 checkIfPRContentChanged-1753429692420322192/dev45-0706 checkIfPRContentChanged-1752730301603610417/dev45-0706 dev45-0706 45 2025-07-10 18:08:05 +0800
• 059a6eb391 Merge pull request 'dev-0708-yjm' (#142) from dev-0708-yjm into dev45-0703NewVer yjm484 2025-07-08 19:54:32 +0800
• acf57194d4 Merge branch 'dev45-0703NewVer' into dev-0708-yjm checkIfPRContentChanged-1753429692420322192/dev-0708-yjm checkIfPRContentChanged-1752730301603610417/dev-0708-yjm #142 dev-0708-yjm yjm484 2025-07-08 19:54:18 +0800
• a7da823374 删除temp yjm484 2025-07-08 19:52:45 +0800
• a8aff8ff3d turnmaster的反转 yjm484 2025-07-08 19:51:27 +0800
• 22fe015f3f Merge pull request 'dev45-0706' (#141) from dev45-0706 into dev45-0703NewVer 45 2025-07-08 19:51:06 +0800
• 5feef67d6a 合并冲突0708 #141 45 2025-07-08 19:36:27 +0800
• 158d76e531 武器单元0708 45 2025-07-08 19:25:13 +0800
• 78187460ad Merge pull request '删除playerOn和卡牌相关' (#140) from dev-0708-yjm into dev45-0703NewVer yjm484 2025-07-08 14:21:30 +0800
• 5ce648ca42 删除playerOn和卡牌相关 #140 yjm484 2025-07-08 14:20:20 +0800
• 30dff80b70 分数条0707 45 2025-07-07 17:38:13 +0800