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

• 8f48a1ed69 玩家属性修改 45 2025-04-07 16:57:46 +0800
• c42cb3a8f0 冲突修改 yjm484 2025-04-07 16:08:56 +0800
• fd0f712e21 Merge pull request 'dev45-0402' (#102) from dev45-0402 into dev-1217 45 2025-04-07 16:00:13 +0800
• 52107035f8 丢牌文字描述 #102 45 2025-04-07 15:58:29 +0800
• ad6f9cc492 Merge pull request '0407更新' (#101) from dev-0407-yjm into dev-1217 yjm484 2025-04-07 15:46:53 +0800
• 897f901b12 0407更新 #101 yjm484 2025-04-07 15:45:07 +0800
• 9e995455f6 ui替换 45 2025-04-07 12:56:51 +0800
• 041a064fc8 Merge pull request 'dev45-0328' (#100) from dev45-0328 into dev-1217 45 2025-04-02 19:49:09 +0800
• 20d375fce8 合并冲突 #100 45 2025-04-02 19:48:35 +0800
• c9074dde01 开始加成点 45 2025-04-02 19:38:53 +0800
• e9e6285431 Merge pull request '0402更新' (#99) from dev-0402-yjm into dev-1217 yjm484 2025-04-02 19:36:00 +0800
• 4fb55f4ab7 0402更新 #99 yjm484 2025-04-02 19:33:50 +0800
• dc2f4f0644 卡牌特殊触发框 45 2025-03-31 13:57:42 +0800
• 94051d8358 角色站立效果 45 2025-03-30 14:23:50 +0800
• f3f3552312 Merge pull request 'dev45-0325' (#98) from dev45-0325 into dev-1217 45 2025-03-28 14:21:46 +0800
• 1d7808a912 冲突合并 #98 45 2025-03-28 14:20:09 +0800
• 08cd70d8e6 怪物意图攻击范围检测 45 2025-03-28 14:14:28 +0800
• d23f0c85b2 Merge pull request '高亮函数' (#97) from dev-0325-yjm into dev-1217 yjm484 2025-03-28 14:07:59 +0800
• 9259b0ed3d Merge branch 'dev-1217' into dev-0325-yjm #97 yjm484 2025-03-28 14:07:54 +0800
• 5bf9c36cda 高亮函数 yjm484 2025-03-28 14:07:21 +0800
• e1d8b911eb Merge pull request 'bug修复' (#96) from dev-0325-yjm into dev-1217 yjm484 2025-03-28 13:58:16 +0800
• 45146c5ec0 Merge branch 'dev-1217' into dev-0325-yjm #96 yjm484 2025-03-28 13:58:01 +0800
• bc935a47a5 bug修复 yjm484 2025-03-28 13:57:19 +0800
• 22453be879 效果卡图 45 2025-03-27 16:59:30 +0800
• e2df11c9ca 初步流程整合 45 2025-03-27 15:47:30 +0800
• f0662b5dbc 涂色卡新版 45 2025-03-25 16:30:25 +0800
• 0bc24741a3 Merge pull request '怪物修缮' (#95) from dev-0325-yjm into dev-1217 yjm484 2025-03-25 05:36:27 +0800
• b6e19d8f7a 建议多写重载 #95 yjm484 2025-03-25 05:35:38 +0800
• 895dd3dac3 解决冲突 yjm484 2025-03-25 05:06:30 +0800
• fa2a5eb40c 怪物修缮 yjm484 2025-03-25 04:46:43 +0800
• fbff2ef457 Merge pull request 'dev45-0318' (#94) from dev45-0318 into dev-1217 45 2025-03-24 19:10:42 +0800
• b0be303d8b 怪物意图描述 #94 45 2025-03-24 19:08:14 +0800
• 295e8cd143 药水，遗物奖励 45 2025-03-21 18:28:56 +0800
• e4525aafb2 Merge pull request '锻造奖励' (#93) from dev45-0316 into dev-1217 45 2025-03-18 15:32:27 +0800
• 11968e3368 合并冲突 #93 45 2025-03-18 15:24:04 +0800
• 8d255a617f 锻造奖励 45 2025-03-18 14:48:47 +0800
• c2f67afd62 Merge pull request '怪物修改1' (#92) from dev-0318-yjm into dev-1217 yjm484 2025-03-18 13:47:57 +0800
• 3bf872366f 怪物修改1 #92 yjm484 2025-03-18 13:46:08 +0800
• 6ad74621a6 Merge pull request 'dev45-0310' (#91) from dev45-0310 into dev-1217 45 2025-03-16 01:23:06 +0800
• d46b666437 合并冲突0316 #91 45 2025-03-16 01:22:24 +0800
• 0ba0a72b13 弃牌界面 45 2025-03-16 01:15:02 +0800
• 27ec8ba409 Merge pull request '新怪物' (#90) from dev-0315-yjm1 into dev-1217 yjm484 2025-03-15 15:48:11 +0800
• 774d4e1376 新怪物 #90 yjm484 2025-03-15 15:44:31 +0800
• c9a8135727 效果锻造合并 45 2025-03-13 13:15:49 +0800
• 748982ace5 Merge pull request '卡牌描述超链接' (#89) from dev45-0304 into dev-1217 45 2025-03-10 16:07:09 +0800
• 0ea9d2700a 合并 #89 45 2025-03-10 16:03:33 +0800
• 8f4d5496e4 卡牌描述超链接 45 2025-03-10 15:52:11 +0800
• f4dcfe35b9 Merge pull request '卡牌锻造' (#88) from dev-0310-yjm into dev-1217 yjm484 2025-03-10 15:28:56 +0800
• d60d31186d 卡牌锻造 #88 yjm484 2025-03-10 15:26:40 +0800
• 2dd608b68d Merge pull request 'dev45-0204' (#87) from dev45-0204 into dev-1217 45 2025-03-04 17:12:11 +0800
• 30ec72826b 合并冲突 #87 45 2025-03-04 17:11:53 +0800
• f51fcfee2b 合并冲突 #85 45 2025-03-04 16:11:47 +0800
• 6b40c8f75d 特效系统完善 #86 45 2025-03-04 16:03:11 +0800
• 62b43a21f6 Merge pull request '小Bugfix' (#84) from dev-0304-yjm1 into dev-1217 yjm484 2025-03-04 05:06:50 +0800
• 7d80a1a9c8 Merge branch 'dev-1217' into dev-0304-yjm1 #84 yjm484 2025-03-04 05:06:40 +0800
• 2d1d15db8c Merge branch 'dev-0304-yjm1' of http://120.27.238.24:3000/cathouse/test_45 into dev-0304-yjm1 yjm484 2025-03-04 05:04:49 +0800
• 9ee8545a96 bugfix yjm484 2025-03-04 05:04:35 +0800
• 85b134c23a Merge pull request '更新卡牌描述' (#83) from dev-0304-yjm1 into dev-1217 yjm484 2025-03-04 03:54:40 +0800
• 572fb5cde6 Merge branch 'dev-1217' into dev-0304-yjm1 #83 yjm484 2025-03-04 03:54:19 +0800
• 973f81b571 更新卡牌描述 yjm484 2025-03-04 03:53:35 +0800
• 728bd24594 火焰攻击动效 45 2025-03-01 21:28:25 +0800
• bd8d4cd9ec 地块改色优化 45 2025-02-28 19:16:43 +0800
• a96a1ca2eb Merge pull request 'dev45-0204' (#82) from dev45-0204 into dev-1217 yjm484 2025-02-28 03:18:25 +0800
• 972201e645 Merge branch 'dev-1217' into dev45-0204 #82 yjm484 2025-02-28 03:17:52 +0800
• b34797c4e7 Merge pull request '版本更新' (#81) from dev-0228-yjm1 into dev45-0204 yjm484 2025-02-28 03:17:17 +0800
• fc02281b76 修改冲突 #81 yjm484 2025-02-28 03:15:48 +0800
• b64f5b0113 版本更新 yjm484 2025-02-28 02:56:49 +0800
• fd8b5e61db Merge pull request 'dev45-0204' (#80) from dev45-0204 into dev-1217 45 2025-02-27 19:04:04 +0800
• 2368a8ec12 地块泛光和优化 #80 45 2025-02-27 18:53:22 +0800
• 13070b9ff4 临时地块替换 45 2025-02-26 21:27:41 +0800
• 4af5cfe8d6 素材替换 45 2025-02-25 21:23:01 +0800
• 9a8b12ddab 事件填充完成，新事件类型 软件204张景程 2025-02-19 22:29:33 +0800
• 7c1e40e0d6 事件填充，战斗ui替换 软件204张景程 2025-02-18 20:26:46 +0800
• 12b9a7dae9 药水系统 软件204张景程 2025-02-13 21:26:48 +0800
• 9c3c7ead7e 商店更新 软件204张景程 2025-02-11 18:55:39 +0800
• bacd8c3d14 地图节点 软件204张景程 2025-02-08 14:15:45 +0800
• 3e0194b6ed 屏蔽卡牌射程UI 软件204张景程 2025-02-06 20:09:22 +0800
• ed0c4e3c02 卡牌发动优化，锻造优化 软件204张景程 2025-02-06 19:41:29 +0800
• 8a80ecb2b1 卡牌发动判断，锻造系统优化 软件204张景程 2025-02-05 16:47:18 +0800
• ff1f35ce0b 卡牌边框发光 软件204张景程 2025-02-04 20:22:41 +0800
• 668eb39cdc 资源迁移 软件204张景程 2025-02-04 17:38:33 +0800
• f5914784b5 锻造改色 checkIfPRContentChanged-1753429692420322192/dev45-0117 checkIfPRContentChanged-1752730301603610417/dev45-0117 dev45-0117 45 2025-01-24 19:53:18 +0800
• cc662edc80 Merge pull request '小bug修改' (#79) from dev45-0117 into dev-1217 45 2025-01-21 19:29:17 +0800
• 038cb9d0b2 小bug修改 #79 45 2025-01-21 19:28:07 +0800
• e7ac20b6e7 Merge pull request 'dev45-0117' (#78) from dev45-0117 into dev-1217 45 2025-01-21 19:01:16 +0800
• 991b708602 合并冲突 #78 45 2025-01-21 19:00:41 +0800
• f36e91ac3b 锻造系统改色范围 45 2025-01-21 18:50:13 +0800
• 9ea97ef018 Merge pull request '0121提交' (#77) from dev-1217-yjm0121 into dev-1217 yjm484 2025-01-21 18:36:38 +0800
• 9fa13345ff 0121提交 checkIfPRContentChanged-1753429692420322192/dev-1217-yjm0121 checkIfPRContentChanged-1752730301603610417/dev-1217-yjm0121 #77 dev-1217-yjm0121 yjm484 2025-01-21 18:07:33 +0800
• db62137a95 锻造系统UI 45 2025-01-20 20:39:02 +0800
• 17161ed7c0 学院草稿美术替换-1 45 2025-01-10 17:25:58 +0800
• f19b0d718c 武器系统完善，涂色数量修正 45 2025-01-08 19:02:09 +0800
• 58548899e7 地块涂色完善 45 2025-01-07 19:43:42 +0800
• 599435930d Merge pull request 'dev45-1218' (#76) from dev45-1218 into dev-1217 45 2025-01-07 15:23:18 +0800
• fd0ae71014 合并冲突 #76 45 2025-01-07 15:22:54 +0800
• c0ae20c895 Merge pull request '0107修改' (#75) from dev-1217-yjm0107 into dev-1217 yjm484 2025-01-07 15:14:29 +0800
• 272439f911 0107修改 checkIfPRContentChanged-1753429692420322192/dev-1217-yjm0107 checkIfPRContentChanged-1752730301603610417/dev-1217-yjm0107 #75 dev-1217-yjm0107 yjm484 2025-01-07 15:10:54 +0800
• b2ab562441 武器系统改版 45 2025-01-07 14:54:27 +0800
• 9726dc47ff 亡语结算 45 2024-12-27 18:05:27 +0800
• 5827875a3d 地块生成上限算法修改 45 2024-12-26 01:15:25 +0800