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

• 8c0da88f6e 染色嵌套 45 2024-12-24 22:35:23 +0800
• 0ebd855a43 新选关框架_2 45 2024-12-23 10:23:34 +0800
• ee024877bc 涂色预览范围修正 45 2024-12-18 18:21:43 +0800
• d1d33aae7d 合并代码 yjm484 2024-12-17 16:49:12 +0800
• 6be0ae23f6 一些修正 checkIfPRContentChanged-1753429692420322192/dev-0524-1212 checkIfPRContentChanged-1752730301603610417/dev-0524-1212 dev-0524-1212 yjm484 2024-12-16 17:57:11 +0800
• b21907552c 合并前修改 45 2024-12-16 14:49:23 +0800
• 6ea71a6ad5 邻接池bug 45 2024-12-13 16:22:49 +0800
• 8423ddf5f7 卡牌修改 yjm484 2024-12-13 14:23:47 +0800
• 7821853233 美术素材撤回 45 2024-12-13 14:22:58 +0800
• 40d60bb289 场景地块调整和ui 45 2024-12-08 20:49:24 +0800
• 6cbb2fc81e 新放置物品和金属地块 45 2024-12-07 19:09:55 +0800
• 1659541fc3 修改无范围卡数值预览 45 2024-12-04 19:48:32 +0800
• 5f15ce7b07 涂色预览bug修复-2 45 2024-12-04 11:08:08 +0800
• d1aa29d8d7 涂色预览bug修复 45 2024-12-04 10:52:15 +0800
• 4d6950ed96 颜色条预览 45 2024-12-03 20:47:02 +0800
• 4c8a6997a9 地块修改 45 2024-12-02 19:25:29 +0800
• a71de69b62 地块父级 45 2024-12-02 16:10:33 +0800
• 578601f48a 新场景 45 2024-12-02 15:32:14 +0800
• ff87d500a9 暂存 45 2024-11-29 10:53:29 +0800
• a6de765c8a 2d场景重构 45 2024-11-28 19:49:47 +0800
• acf3e5fb78 场地侧挡 45 2024-11-28 01:27:40 +0800
• 7306742534 场景底板更换，部分地块动效 45 2024-11-27 19:34:28 +0800
• ed87045bd3 加入伤害预览和物品牌 45 2024-11-25 20:12:40 +0800
• 1d0fcbe1ff 攻击特效 45 2024-11-25 10:57:40 +0800
• f56cd2b532 场景优化1111 45 2024-11-20 17:11:44 +0800
• b3693f7ff2 塔场景 45 2024-11-15 18:06:03 +0800
• a6827bda3d 白天场景搭建 45 2024-11-14 22:48:44 +0800
• 7458b9941f 范围展示优化3，视角优化 45 2024-11-13 20:38:48 +0800
• 46fdd71fa1 范围显示修改 45 2024-11-12 22:14:06 +0800
• b1baa48bb2 视角限制修改 45 2024-11-11 19:48:08 +0800
• 98b8f11651 场景环境更新 45 2024-11-11 13:42:27 +0800
• 4b15cb44c2 Merge pull request 'dev-1027-4' (#74) from dev-1027-4 into dev-0524 checkIfPRContentChanged-1753429692420322192/dev-0524 checkIfPRContentChanged-1752730301603610417/dev-0524 dev-0524 45 2024-11-01 17:26:50 +0800
• b7efb89c1e 打包版本1 #74 45 2024-11-01 17:25:52 +0800
• de48007c69 加入事件,成品导出 45 2024-10-28 05:50:31 +0800
• 4ffe572d92 Merge pull request '遗物弹窗。新事件' (#73) from dev-1027-3 into dev-0524 45 2024-10-27 23:12:07 +0800
• 8225183b7d 遗物弹窗。新事件 #73 45 2024-10-27 23:11:27 +0800
• b53e16a1bc Merge pull request '修bug' (#72) from dev0524-1027-a into dev-0524 yjm484 2024-10-27 23:10:47 +0800
• df56efc271 修bug #72 yjm484 2024-10-27 23:09:57 +0800
• a57015d948 Merge pull request 'buff弹窗差文字' (#71) from dev-1027-2 into dev-0524 45 2024-10-27 18:36:34 +0800
• 3c261c0df6 buff弹窗差文字 #71 45 2024-10-27 18:35:26 +0800
• 54949c886f 随机获得遗物 yjm484 2024-10-27 17:14:50 +0800
• 9fca47b6b0 Merge pull request '怪物动画' (#70) from dev-1027 into dev-0524 45 2024-10-27 15:28:34 +0800
• 712e6e2727 怪物动画 #70 45 2024-10-27 15:28:00 +0800
• 802d62b715 小修改 45 2024-10-27 14:25:35 +0800
• 49d4788bac Merge pull request 'dev-1026-3' (#69) from dev-1026-3 into dev-0524 45 2024-10-27 03:17:23 +0800
• b65d508df9 合并冲突 #69 #68 45 2024-10-27 03:16:39 +0800
• ef16e636cb 新手引导-2,资料书 45 2024-10-27 03:08:33 +0800
• 86d04de9ec Merge pull request '100个bug修正' (#67) from dev-0524-1027 into dev-0524 yjm484 2024-10-27 02:00:55 +0800
• 4b553b8aa4 100个bug修正 #67 yjm484 2024-10-27 01:59:21 +0800
• 34449e0846 新手引导-1 45 2024-10-26 23:04:19 +0800
• e742fc78ec Merge pull request '主界面按钮滑动' (#66) from dev-1026-2 into dev-0524 45 2024-10-26 21:19:11 +0800
• e7015c9246 主界面按钮滑动 #66 45 2024-10-26 21:18:24 +0800
• 7e5d4f6655 初始卡牌改色bug yjm484 2024-10-26 21:17:26 +0800
• a60877bdcb 修改遗物excel yjm484 2024-10-26 20:21:24 +0800
• 90f7aeb637 打包修改 45 2024-10-26 20:04:13 +0800
• 8d3dfeba5d Merge pull request 'dev-1025-3' (#65) from dev-1025-3 into dev-0524 45 2024-10-26 18:13:27 +0800
• 8c7a0fb297 冲突合并 #65 #64 45 2024-10-26 18:11:46 +0800
• 0e0f8e239d Merge pull request '新祝福' (#63) from dev-0524-1026 into dev-0524 yjm484 2024-10-26 18:06:22 +0800
• ee85538f37 新祝福 #63 yjm484 2024-10-26 18:05:34 +0800
• deea18755d 卡牌信息弹框-2 45 2024-10-26 18:01:07 +0800
• b415d96983 卡牌信息弹框 45 2024-10-26 05:25:45 +0800
• 11a679d11d 初始卡牌加入牌组，卡牌弹窗部分加入 45 2024-10-25 22:30:22 +0800
• 888dfb968d 怪物池实装 yjm484 2024-10-25 20:58:15 +0800
• edff44f202 Merge pull request 'dev-1025' (#62) from dev-1025 into dev-0524 45 2024-10-25 20:34:50 +0800
• 52e3f7f3e4 Merge pull request '1025BUG修改' (#61) from dev-0524-1025 into dev-0524 yjm484 2024-10-25 20:34:14 +0800
• 58ca9e6ce7 1025BUG修改 #61 yjm484 2024-10-25 20:33:04 +0800
• 57ad22948c 优化，地图关联怪物池 #62 45 2024-10-25 20:32:15 +0800
• 9f5e6028ac 新ui 45 2024-10-25 18:31:53 +0800
• 5a2261721a Merge pull request 'dev-1024' (#60) from dev-1024 into dev-0524 45 2024-10-25 15:26:26 +0800
• 4d675a79de 卡牌ui优化-2 #60 45 2024-10-25 15:25:43 +0800
• a6e5b49046 卡牌ui优化，商店新增，加入弹窗提示 45 2024-10-25 01:59:10 +0800
• 843ee64280 Merge pull request 'dev-1023' (#59) from dev-1023 into dev-0524 45 2024-10-24 20:16:27 +0800
• 1d64c25055 合并冲突 #59 #58 45 2024-10-24 20:15:36 +0800
• a1ffa565cf 遗物购买系统 45 2024-10-24 20:10:39 +0800
• 55ace817ee Merge pull request '卡牌修改' (#57) from dev-0524-1024 into dev-0524 yjm484 2024-10-24 20:09:21 +0800
• 1bb6705e67 卡牌修改 #57 yjm484 2024-10-24 20:07:16 +0800
• 0b0966c79c ui界面修缮 45 2024-10-24 17:25:40 +0800
• 074df3c446 aoe特效修改 45 2024-10-24 03:59:00 +0800
• 3742eaadec 文件路径修改 45 2024-10-23 18:54:43 +0800
• 449e5455f5 csv读取修改 yjm484 2024-10-23 18:22:05 +0800
• 9daafc5b41 Merge pull request 'dev-1022-3' (#56) from dev-1022-3 into dev-0524 45 2024-10-23 17:29:30 +0800
• 0ade7c20a9 Merge pull request 'bug修复' (#55) from dev-0524-1023 into dev-0524 yjm484 2024-10-23 17:27:52 +0800
• 48146d70dc ui优化，敌人优化-3 #56 45 2024-10-23 17:27:50 +0800
• b9e946ea5c bug修复 #55 yjm484 2024-10-23 17:27:15 +0800
• 7bb5409887 敌人优化-2 45 2024-10-23 01:16:03 +0800
• 4573eae345 敌人aoe修复 yjm484 2024-10-22 19:55:00 +0800
• f894683d9d Merge pull request '敌人优化-1' (#54) from dev-1022 into dev-0524 45 2024-10-22 19:41:52 +0800
• 5cbcf4c40a Merge pull request '修复BUG' (#53) from dev-0524-1021 into dev-0524 yjm484 2024-10-22 19:40:57 +0800
• 069040665b 修复BUG #53 yjm484 2024-10-22 19:40:16 +0800
• 83e5dd9a2e 敌人优化-1 #54 45 2024-10-22 19:40:12 +0800
• de718a53cf 合并修改bug 45 2024-10-22 17:33:57 +0800
• ec50c290d8 Merge pull request 'dev-0524-1021' (#52) from dev-0524-1021 into dev-0524 yjm484 2024-10-22 16:54:02 +0800
• 3769e8f494 修复 #52 yjm484 2024-10-22 16:53:42 +0800
• 4cabd2acff Merge pull request 'dev-1016-3' (#51) from dev-1016-3 into dev-0524 45 2024-10-22 16:17:07 +0800
• 5f1805f3c5 场景完善,ui图层bug修改 #51 45 2024-10-22 16:15:33 +0800
• 5a1f859cd5 bug修复 yjm484 2024-10-22 15:44:05 +0800
• 77b5525e20 新怪物 yjm484 2024-10-21 01:20:39 +0800
• ee7ed4bde2 武器和商店素材替换 45 2024-10-21 01:08:16 +0800
• f3fb1432c1 设置音量，商店完善 45 2024-10-20 17:55:43 +0800
• 4820bfbadd 武器界面优化,奖励界面优化 45 2024-10-20 02:49:11 +0800