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

• aabfdb8a38 Merge pull request 'dev45-0705' (#139) from dev45-0705 into dev45-0703NewVer 45 2025-07-05 18:22:18 +0800
• 14cad7ad7a 合并0705 checkIfPRContentChanged-1752730301603610417/dev45-0705 #139 45 2025-07-05 18:21:25 +0800
• 8bfc30c1e5 Merge pull request '0705提交' (#138) from dev-1217-0703yjm into dev45-0705 45 2025-07-05 16:42:30 +0800
• d420698b72 Merge branch 'dev45-0705' into dev-1217-0703yjm checkIfPRContentChanged-1753429692420322192/dev-1217-0703yjm checkIfPRContentChanged-1752730301603610417/dev-1217-0703yjm #138 dev-1217-0703yjm 45 2025-07-05 16:41:58 +0800
• 5531bcfab9 0705提交 yjm484 2025-07-05 04:13:57 +0800
• 632acc2b53 商店ui0704 45 2025-07-04 20:25:20 +0800
• 007129daac Merge pull request 'dev45-0626' (#137) from dev45-0626 into dev-1217 checkIfPRContentChanged-1753429692420322192/dev-1217 checkIfPRContentChanged-1752730301603610417/dev-1217 dev-1217 45 2025-07-03 16:33:07 +0800
• e1532dabf9 ui替换0703 checkIfPRContentChanged-1752730301603610417/dev45-0626 #137 45 2025-07-03 16:31:00 +0800
• de9aa37cc8 商店ui替换0702 45 2025-07-02 17:52:55 +0800
• 3089244b97 Merge pull request 'dev-1217' (#136) from dev-1217 into devgjf-0628 checkIfPRContentChanged-1753429692420322192/devgjf-0628 checkIfPRContentChanged-1752730301603610417/devgjf-0628 devgjf-0628 Dencer 2025-06-28 14:57:36 +0800
• a5e43a09eb Merge pull request 'ui替换0628' (#135) from dev45-0626 into dev-1217 #136 45 2025-06-28 14:11:17 +0800
• d6b76a9ed6 ui替换0628 #135 45 2025-06-28 14:08:16 +0800
• 41811c701b Merge pull request '0625提交' (#134) from dev-0624-yjm into dev-1217 yjm484 2025-06-25 14:29:08 +0800
• 3113c5e4ce Merge branch 'dev-1217' into dev-0624-yjm checkIfPRContentChanged-1753429692420322192/dev-0624-yjm checkIfPRContentChanged-1752730301603610417/dev-0624-yjm #134 dev-0624-yjm yjm484 2025-06-25 14:28:21 +0800
• 15770290d1 0625提交 yjm484 2025-06-25 14:27:43 +0800
• c69faa10e6 Merge pull request '0624更新' (#133) from dev-0624-yjm into dev-1217 yjm484 2025-06-24 19:31:36 +0800
• d876feadcf 修正冲突 #133 yjm484 2025-06-24 19:29:41 +0800
• cf490776ac 0624更像 yjm484 2025-06-24 19:14:27 +0800
• 4e8066d95e Merge pull request 'dev45-0618' (#132) from dev45-0618 into dev-1217 45 2025-06-23 20:53:02 +0800
• 732c4e66d7 ui替换0623 #132 45 2025-06-23 20:43:37 +0800
• 7da213a4ad ui替换0622 45 2025-06-22 21:01:10 +0800
• f8f100c9eb Merge pull request 'bug修缮0617' (#131) from dev45-0612 into dev-1217 45 2025-06-17 12:48:30 +0800
• 0e518189e5 bug修缮0617 #131 45 2025-06-17 12:45:17 +0800
• 701c47d2b9 Merge pull request '特效替换0612' (#130) from dev45-0612 into dev-1217 45 2025-06-13 16:36:39 +0800
• cb57423b8f 特效替换0612 #130 45 2025-06-12 19:49:55 +0800
• 8095a9a031 Merge pull request 'dev45-0603' (#129) from dev45-0603 into dev-1217 45 2025-06-12 12:49:16 +0800
• dadab3e3eb 合并冲突0612 #129 #128 #127 45 2025-06-12 12:37:27 +0800
• fcacf276e5 特效场景0612 45 2025-06-12 12:28:02 +0800
• 007ae8110a Merge pull request '0612提交' (#126) from dev-0612-yjm into dev-1217 yjm484 2025-06-12 07:06:11 +0800
• b4db53b544 0612提交 #126 yjm484 2025-06-12 07:03:25 +0800
• abca02672b ui替换0609_2 45 2025-06-09 20:19:25 +0800
• 753fa07dde ui替换0609 45 2025-06-09 19:09:40 +0800
• 2bc41bc235 数据同步0609 软件204张景程 2025-06-09 10:28:33 +0800
• 953f285c72 Merge pull request 'dev45-0528' (#125) from dev45-0528 into dev-1217 checkIfPRContentChanged-1753429692420322192/gjf-1217 checkIfPRContentChanged-1752730301603610417/gjf-1217 gjf-1217 45 2025-06-03 15:15:29 +0800
• 4de97239fc Merge pull request '0530提交' (#124) from dev-0530-yjm into dev-1217 yjm484 2025-05-30 15:21:24 +0800
• 62f1b74045 0530提交 #124 yjm484 2025-05-30 15:20:51 +0800
• a1909ec63a ui替换0529 #125 45 2025-05-29 20:14:18 +0800
• 9c9e79a341 bug修理0528 45 2025-05-28 19:24:09 +0800
• e9d9ddbf0e Merge pull request 'dev45-0521' (#123) from dev45-0521 into dev-1217 45 2025-05-27 16:24:47 +0800
• 1c192e796a 流程修理0527 #123 45 2025-05-27 16:24:01 +0800
• 60719fc31c 效果锻造改版0526 45 2025-05-26 20:56:29 +0800
• 6e06cc2991 Merge pull request 'bug修复' (#122) from dev-0520-yjm1 into dev-1217 yjm484 2025-05-20 21:46:02 +0800
• f99a20c886 bug修复 #122 yjm484 2025-05-20 21:44:32 +0800
• 1e40b6fea8 Merge pull request '涂色卡锻造效果替换0520' (#121) from dev45-0520 into dev-1217 45 2025-05-20 20:02:08 +0800
• a3fff39284 涂色卡锻造效果替换0520 #121 45 2025-05-20 20:01:28 +0800
• d8b03ba249 Merge pull request '场景按钮ui替换' (#120) from dev45-0516 into dev-1217 45 2025-05-20 19:25:46 +0800
• 9b8fc3a335 合并冲突0520 #120 45 2025-05-20 19:25:16 +0800
• ac5700460b Merge pull request '0520更新' (#119) from dev-0513-yjm into dev-1217 yjm484 2025-05-20 19:14:21 +0800
• 7b68fb6b39 Merge branch 'dev-1217' into dev-0513-yjm #119 yjm484 2025-05-20 19:14:01 +0800
• b11ca502ec 0520更新 yjm484 2025-05-20 19:11:49 +0800
• 0e506cac47 场景按钮ui替换 45 2025-05-19 20:59:21 +0800
• 788367f1d7 Merge pull request '0516修正' (#118) from dev-0513-yjm into dev-1217 checkIfPRContentChanged-1753429692420322192/devGjf-0520 checkIfPRContentChanged-1752730301603610417/devGjf-0520 devGjf-0520 yjm484 2025-05-16 03:08:34 +0800
• 8fd0c09fec 解决冲突2 #118 yjm484 2025-05-16 03:07:46 +0800
• d88de8a2fe 解决冲突 yjm484 2025-05-16 03:06:54 +0800
• c907f74f98 0516修正 yjm484 2025-05-16 03:04:21 +0800
• 5be08eaaa1 合并 yjm484 2025-05-16 01:30:37 +0800
• 8c3172edf9 Merge pull request 'dev45-0513' (#117) from dev45-0513 into dev-1217 45 2025-05-15 19:07:36 +0800
• 5011ab2685 流程完善0515 #117 45 2025-05-15 19:00:42 +0800
• c227fc2856 局内跳转0514 45 2025-05-14 20:15:24 +0800
• 40bc6790a5 Merge remote-tracking branch 'origin/dev-1217' into dev-0513-yjm yjm484 2025-05-13 16:50:21 +0800
• 5c71b558cd Merge branch 'dev-1217' into dev-0513-yjm yjm484 2025-05-13 16:42:33 +0800
• 899213d478 药水掉落修复 yjm484 2025-05-13 16:42:14 +0800
• a870588f7a Merge pull request '药水报错空过' (#116) from dev45-0513 into dev-1217 45 2025-05-13 16:41:26 +0800
• e75b568f9b 药水报错空过 #116 45 2025-05-13 16:40:48 +0800
• b9b8a6c050 Merge pull request '预涂色修复0513' (#115) from dev45-0507 into dev-1217 45 2025-05-13 16:07:27 +0800
• 50a38f3cc4 合并冲突0513 #115 45 2025-05-13 16:06:03 +0800
• 94ec3d0c4d Merge pull request '0513提交' (#114) from dev-0513-yjm into dev-1217 yjm484 2025-05-13 16:00:49 +0800
• 1883d17a2c 0513提交 #114 yjm484 2025-05-13 15:59:32 +0800
• 428e1af227 预涂色修复0513 45 2025-05-13 15:59:01 +0800
• 1bf6950099 Merge pull request 'ui替换0506_2' (#113) from dev45-0501 into dev-1217 45 2025-05-06 21:37:47 +0800
• 52a61009a9 ui替换0506_2 #113 45 2025-05-06 21:34:37 +0800
• a8ea2f581d Merge pull request 'ui替换0506' (#112) from dev45-0501 into dev-1217 45 2025-05-06 16:16:47 +0800
• 30d0a5ce7a ui替换0506 #112 45 2025-05-06 16:15:27 +0800
• 7b0fe003d9 Merge pull request 'dev45-0425' (#111) from dev45-0425 into dev-1217 45 2025-05-01 11:53:41 +0800
• f4c7be9c75 冲突合并0501 #111 #110 45 2025-05-01 11:51:27 +0800
• 06fd96a8b8 ui替换0501 45 2025-05-01 11:45:41 +0800
• e845cce6e3 Merge pull request '0501提交' (#109) from dev-0501-yjm into dev-1217 yjm484 2025-05-01 08:38:30 +0800
• 763a1170d9 0501提交 #109 yjm484 2025-05-01 08:34:01 +0800
• 795bbb85b9 ui替换0429 45 2025-04-29 13:55:41 +0800
• db7a069fa5 Merge pull request '怪物信息板优化，用id抽取卡牌实现复制' (#108) from dev45-0418 into dev-1217 45 2025-04-25 19:32:33 +0800
• 60666b5484 冲突合并0425 #108 45 2025-04-25 19:32:15 +0800
• 91ebe71e91 怪物信息板优化，用id抽取卡牌实现复制 45 2025-04-25 19:26:16 +0800
• 041471ab0f Merge pull request '0425提交' (#107) from dev-0425-yjm into dev-1217 yjm484 2025-04-25 16:58:00 +0800
• f1ae7e18ff excel修改 #107 yjm484 2025-04-25 16:55:29 +0800
• 889ac3fd3b 0425提交 yjm484 2025-04-25 16:53:05 +0800
• 3fb782e114 Merge pull request 'dev45-0414' (#106) from dev45-0414 into dev-1217 45 2025-04-18 18:45:36 +0800
• ef84ff8ec7 合并冲突0418 #106 45 2025-04-18 18:44:56 +0800
• a8d789486d Merge pull request '0418提交' (#105) from dev-0418-yjm into dev-1217 yjm484 2025-04-18 18:41:12 +0800
• d5af6ce40b 0418提交 #105 yjm484 2025-04-18 18:40:29 +0800
• c9f959c2d8 范围边界优化 45 2025-04-18 18:37:59 +0800
• 7a87f3f933 bug修改 45 2025-04-18 11:29:28 +0800
• 2cd80574dd Merge pull request 'dev45-0407' (#104) from dev45-0407 into dev-1217 45 2025-04-14 15:52:19 +0800
• ef15819ca6 合并冲突0414 #104 45 2025-04-14 15:51:51 +0800
• c2c951af5b ui选中效果 45 2025-04-14 15:40:39 +0800
• d5b7c7b5ed Merge pull request '能力卡和bugfix' (#103) from dev-0414-yjm into dev-1217 yjm484 2025-04-14 14:17:52 +0800
• 145ce60c2d 能力卡和bugfix #103 yjm484 2025-04-14 14:16:37 +0800
• a19f6362a5 卡牌框特效 45 2025-04-10 15:56:56 +0800
• 8f06d71753 卡牌锻造bug修复 yjm484 2025-04-08 14:34:17 +0800
• 3e31fbd6bc 卡牌锻造bug修复 yjm484 2025-04-08 14:26:01 +0800
• ff4fa30c92 数据库配置文件 45 2025-04-07 17:16:15 +0800