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

• febf920300 地图选项重做 45 2024-10-19 02:27:52 +0800
• bc9c6569e1 加入部分音效-3 45 2024-10-18 21:15:51 +0800
• 0d4dfafb1f 加入部分音效-bgm 45 2024-10-18 06:05:00 +0800
• 4e6f5d216b 加入部分音效 45 2024-10-18 06:02:35 +0800
• 17b9b57818 角色动效 45 2024-10-18 02:08:32 +0800
• 3ef22fde2f Merge pull request '卡牌改色bug修复' (#50) from dev-0524-bugfix1016 into dev-0524 yjm484 2024-10-16 18:54:17 +0800
• 20e83b5787 卡牌改色bug修复 #50 yjm484 2024-10-16 18:53:48 +0800
• 66e1864fd6 Merge pull request '合并修改bug' (#49) from dev-1016 into dev-0524 45 2024-10-16 18:36:06 +0800
• 11101b4093 合并修改bug #49 45 2024-10-16 18:35:36 +0800
• b1e09dee8c Merge pull request '修改深浅拷贝Bug' (#48) from dev-0524-1016 into dev-0524 yjm484 2024-10-16 18:02:47 +0800
• 438d8790d9 修改深浅拷贝Bug #48 yjm484 2024-10-16 18:02:15 +0800
• 7da6dd507b Merge pull request '地块优势' (#47) from dev-0524-1014 into dev-0524 yjm484 2024-10-16 16:56:47 +0800
• ca73c02b71 解决冲突 #47 yjm484 2024-10-16 16:56:30 +0800
• 63654b8f95 地块优势 yjm484 2024-10-16 16:47:41 +0800
• da2cedf6c7 Merge pull request 'dev-1015' (#46) from dev-1015 into dev-0524 45 2024-10-16 16:43:36 +0800
• 0cd16f7e10 商店 #46 45 2024-10-16 16:42:22 +0800
• 6456f50adf 改色和选关修改 45 2024-10-16 04:36:27 +0800
• d25f890616 Merge pull request '卡片自定义' (#45) from dev-0524-1014 into dev-0524 yjm484 2024-10-15 13:42:29 +0800
• 32bc546a12 卡片自定义 #45 yjm484 2024-10-14 23:15:22 +0800
• a690279310 Merge pull request 'dev-1009' (#44) from dev-1009 into dev-0524 45 2024-10-14 04:17:11 +0800
• 90a1fdd974 合并修改 #44 #43 45 2024-10-14 00:56:07 +0800
• c06d300f6d 合并分支 45 2024-10-13 21:38:54 +0800
• 1e1ba81a49 合并冲突 #42 45 2024-10-13 18:53:56 +0800
• db6b3a94bf 商店重构 45 2024-10-13 18:27:59 +0800
• 6d7625adbb Merge pull request '[新卡牌]' (#41) from dev-0524-1013 into dev-0524 yjm484 2024-10-13 17:53:51 +0800
• 35c65aa05a [新卡牌] #41 yjm484 2024-10-13 17:51:05 +0800
• 1bf6ec172b 武器界面 45 2024-10-12 22:34:49 +0800
• 3d29571bb3 场地动效4 45 2024-10-11 02:14:18 +0800
• 2904fd9cd5 场景动效3 45 2024-10-10 04:34:46 +0800
• 056985cfaa Merge pull request 'dev-0925' (#40) from dev-0925 into dev-0524 45 2024-10-09 16:02:25 +0800
• 51679a0cae 场景动效2 #40 45 2024-10-09 16:01:14 +0800
• d5a0212750 场地动效 45 2024-10-09 15:12:41 +0800
• a31d3a51e0 加入特效 45 2024-10-04 22:03:58 +0800
• d3d0e57751 新卡牌 checkIfPRContentChanged-1753429692420322192/dev-0524-1003 checkIfPRContentChanged-1752730301603610417/dev-0524-1003 dev-0524-1003 yjm484 2024-10-03 01:47:00 +0800
• 3d4341ac17 加入换地块特效 45 2024-09-28 22:18:17 +0800
• 5b407eb84a 随从指针和范围预览 45 2024-09-25 22:41:31 +0800
• dd54a91e84 随从技能冷却 45 2024-09-25 18:31:58 +0800
• 2537b6800a Merge pull request 'dev-0924-2' (#39) from dev-0924-2 into dev-0524 45 2024-09-25 14:49:27 +0800
• 47831ce59b 随从优化 #39 45 2024-09-25 14:47:58 +0800
• 9f96b31ef7 Merge pull request '[初始卡牌/影响范围函数放入工具类/初始卡组修改]' (#38) from dev-0524-0923 into dev-0524 yjm484 2024-09-25 14:43:12 +0800
• 0b84c4a577 Merge remote-tracking branch 'origin/dev-0524' into dev-0524-0923 #38 yjm484 2024-09-25 14:41:29 +0800
• 7fe1b94c75 [初始卡牌/影响范围函数放入工具类/初始卡组修改] yjm484 2024-09-25 14:35:23 +0800
• 89c8f41c36 增加弹道 45 2024-09-24 23:06:10 +0800
• b9dc16b9b8 Merge pull request '修改骨头战士UI的Bug' (#37) from dev-0924 into dev-0524 45 2024-09-24 16:47:11 +0800
• 288ff4c775 修改骨头战士UI的Bug #37 45 2024-09-24 16:46:34 +0800
• b2d97476ef Merge pull request '合并修缮' (#36) from dev-0909 into dev-0524 45 2024-09-24 15:13:42 +0800
• afae0661ad 合并修缮 #36 45 2024-09-24 15:12:45 +0800
• 6b3d2f57b9 Merge pull request 'dev-0909' (#35) from dev-0909 into dev-0524 45 2024-09-24 13:02:33 +0800
• 12028f21a8 合并 #35 45 2024-09-24 13:00:47 +0800
• 861e9c18e7 随从功能优化 45 2024-09-23 21:41:54 +0800
• cce8e9fd51 Merge pull request '[卡牌信息同步/BUG修复]' (#34) from dev-0524-0923 into dev-0524 yjm484 2024-09-23 18:44:31 +0800
• 78449f8c5c [卡牌信息同步/BUG修复] #34 yjm484 2024-09-23 18:41:55 +0800
• 042484af3f 添加随从 45 2024-09-22 22:06:15 +0800
• 49cc7abbdb 文字同步，设置UI 45 2024-09-22 13:17:17 +0800
• ab85b6ca7d 卡牌文字同步 45 2024-09-21 15:30:29 +0800
• 8bfae1b8cc 顶UI分离和图层调整，卡牌指针更换 软件204张景程 2024-09-18 21:56:18 +0800
• dc47364b95 牌库UI资源替换 软件204张景程 2024-09-13 00:38:48 +0800
• 2a1f6f7880 指针优化 软件204张景程 2024-09-12 16:28:27 +0800
• f78d144b38 新增地图 软件204张景程 2024-09-12 14:32:28 +0800
• fd5d2fea03 战局内卡牌查看 软件204张景程 2024-09-11 15:49:38 +0800
• 4d594c84c6 buff图标添加，敌人UI统合 软件204张景程 2024-09-10 18:53:47 +0800
• daa823dc50 0909美术修改 软件204张景程 2024-09-10 01:13:39 +0800
• e444577fe1 Merge pull request '新美术素材：地块替换。卡牌，战斗界面' (#33) from dev-0906 into dev-0524 45 2024-09-07 22:53:39 +0800
• b2df093e2e 新美术素材：地块替换。卡牌，战斗界面 #33 软件204张景程 2024-09-07 22:49:24 +0800
• 5bb6fdbbbb Merge pull request 'dev-0903' (#32) from dev-0903 into dev-0524 45 2024-09-06 10:33:58 +0800
• b0054624e2 Merge branch 'dev-0524' into dev-0903 #32 #31 #30 45 2024-09-06 02:01:02 +0800
• a6f645c59c Merge pull request '新遗物' (#29) from dev-054-0906 into dev-0524 yjm484 2024-09-06 01:13:04 +0800
• 78de92b3d7 新遗物 #29 yjm484 2024-09-06 01:09:55 +0800
• 6726d170d2 角色动画 软件204张景程 2024-09-03 14:21:32 +0800
• f8a4b2315e 战斗素材替换 软件204张景程 2024-09-03 10:40:01 +0800
• 5b8c01453d Merge pull request '0902提交' (#28) from dev-0524-0827 into dev-0524 yjm484 2024-09-02 13:42:59 +0800
• 9c298cc0ff 冲突修正 #28 yjm484 2024-09-02 13:42:18 +0800
• 7f1c13f488 0902提交 yjm484 2024-09-02 13:29:56 +0800
• 9d3d1371f5 Merge pull request '8-30修bug，意图优化' (#27) from dev-0830 into dev-0524 45 2024-08-31 21:26:42 +0800
• b83769cba7 8-30修bug，意图优化 #27 软件204张景程 2024-08-31 21:22:59 +0800
• fdacf80c3d Merge pull request '新卡牌' (#26) from dev-0524-0827 into dev-0524 yjm484 2024-08-27 01:28:48 +0800
• 9acef2fda2 修改 #26 yjm484 2024-08-27 01:28:31 +0800
• 04d75cc2eb 新卡牌 yjm484 2024-08-27 01:21:13 +0800
• 4c86e3efde Merge pull request 'dev-0822' (#25) from dev-0822 into dev-0524 45 2024-08-26 19:18:13 +0800
• 2eac5165ed 低级卡牌框 #25 45 2024-08-26 17:55:57 +0800
• 71642d2c99 卡牌动效实现，意图更改中，关卡联动中 45 2024-08-26 17:23:24 +0800
• 47889a4a08 程序化抽卡动画 45 2024-08-25 12:05:59 +0800
• 91cb8d02c0 小卡牌预制体 45 2024-08-23 21:33:49 +0800
• a63262e64e Merge pull request 'dev-0818' (#24) from dev-0818 into dev-0524 45 2024-08-22 16:57:55 +0800
• 20dd06e9a5 Merge remote-tracking branch 'origin/dev-0524' into dev-0818 #24 45 2024-08-22 16:52:57 +0800
• 5af388b67f Merge pull request '新增怪物池' (#23) from dev-0524-0822 into dev-0524 yjm484 2024-08-22 16:21:32 +0800
• 453e92e9bd 新增怪物池 #23 yjm484 2024-08-22 16:20:08 +0800
• 601be1cae5 手卡UI 45 2024-08-22 16:16:04 +0800
• 026d3cb234 卡牌UI重构 45 2024-08-21 01:23:24 +0800
• 6d0e2fffb8 意图完善，奖励卡牌生成，修改手卡表 45 2024-08-20 14:07:59 +0800
• 4e63f72802 合并修复0818 45 2024-08-18 16:48:15 +0800
• b9f830437c Merge pull request '遗物，商店，奖励系统' (#22) from dev-0815 into dev-0524 45 2024-08-18 16:39:44 +0800
• 88485f3f6c 合并 #22 45 2024-08-18 16:39:11 +0800
• 618c71844e 遗物，商店，奖励系统 45 2024-08-18 15:36:30 +0800
• c200a81915 Merge pull request '卡牌奖励概率修改' (#21) from dev-0524-0814 into dev-0524 yjm484 2024-08-18 05:08:56 +0800
• 1ee6bbd149 卡牌奖励概率修改 #21 yjm484 2024-08-18 05:08:29 +0800
• 577b84c19c Merge pull request '怪物提交' (#20) from dev-0524-0814 into dev-0524 yjm484 2024-08-18 04:58:40 +0800
• d43782c0b9 怪物提交 #20 yjm484 2024-08-18 04:54:43 +0800
• 23e364a999 后续修改 yjm484 2024-08-13 14:27:07 +0800
• e5c9455336 buff合并 yjm484 2024-08-13 14:19:35 +0800