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

• 59cbe9cf07 buff提交 #19 yjm484 2024-08-13 13:59:40 +0800
• db20780d42 Merge branch 'dev-0524' into dev-0724 #17 yjm484 2024-08-12 17:30:26 +0800
• 67d50b4296 Merge pull request 'dev-0724' (#18) from dev-0724 into dev-0524 45 2024-08-12 17:28:56 +0800
• f87f182cfb 意图优化 #18 45 2024-08-12 00:20:11 +0800
• 5441bc91bc 关卡选择完成 45 2024-08-11 14:26:59 +0800
• d808008265 选关地图生成和部分素材替换 45 2024-08-10 23:51:47 +0800
• e7cad33b42 关卡选择进行中 软件204张景程 2024-08-09 17:39:19 +0800
• 301e65f13c Merge pull request 'dev-0721' (#16) from dev-0721 into dev-0524 45 2024-07-24 03:40:45 +0800
• ecbfe125a2 删除 #16 软件204张景程 2024-07-24 03:37:06 +0800
• 02e3325cfa 添加腐蚀闪位等 软件204张景程 2024-07-24 03:20:18 +0800
• 6bce26b0b1 加入寄生等 软件204张景程 2024-07-24 00:45:21 +0800
• f579360a78 添加敌人生成器，重构敌人buff机制 软件204张景程 2024-07-23 05:54:20 +0800
• bc70537c49 加入火种buff 软件204张景程 2024-07-22 14:39:25 +0800
• 49bc6a90a7 删除debug内容 yjm484 2024-07-20 02:18:24 +0800
• edf0b42107 怪物逻辑重做合并 yjm484 2024-07-20 02:12:35 +0800
• 663ddec061 怪物出伤和移动加入1s延迟 #14 yjm484 2024-07-20 02:04:50 +0800
• 8108d990c4 Merge pull request 'dev-0714' (#15) from dev-0714 into dev-0524 45 2024-07-19 22:56:34 +0800
• b0dd52c2f7 buff添加 #15 软件204张景程 2024-07-19 22:52:07 +0800
• 81e43d8377 [DEV]敌人逻辑重做 yjm484 2024-07-19 05:11:34 +0800
• ec9a042fb6 玩家方buff增加 软件204张景程 2024-07-17 00:16:02 +0800
• 53cdb5d2c0 基础关卡流程框架 软件204张景程 2024-07-14 22:17:59 +0800
• d141f4eb7b 流程搭建 软件204张景程 2024-07-14 04:19:22 +0800
• 5cadb49567 Merge pull request '优化射线对障碍物判定方法' (#13) from dev-0713 into dev-0524 45 2024-07-13 15:53:13 +0800
• c1e6bc4353 优化射线对障碍物判定方法 #13 软件204张景程 2024-07-13 15:50:27 +0800
• 8014720748 Merge pull request '[代码重构]把所有的list<mapunity>换成hashset' (#12) from dev-0524-0711 into dev-0524 yjm484 2024-07-12 05:57:20 +0800
• 3e7ff0543a Merge branch 'dev-0524' into dev-0524-0711 #12 yjm484 2024-07-12 05:56:26 +0800
• 539eb5ac33 [代码重构]把所有的list<mapunity>换成hashset yjm484 2024-07-12 05:52:45 +0800
• e74c43caff Merge pull request 'dev-0524-0710BUGFIX' (#11) from dev-0524-0710BUGFIX into dev-0524 yjm484 2024-07-11 01:00:12 +0800
• f95ac5d8c6 0710BUGFIX #11 yjm484 2024-07-11 00:58:19 +0800
• e97794e403 射线避障修改 yjm484 2024-07-10 17:46:57 +0800
• c00bfde90e Merge pull request '0707BUGFIX' (#10) from dev-0524-0707bugfix into dev-0524 yjm484 2024-07-07 19:39:03 +0800
• 3109bbb7b2 0707BUGFIX #10 yjm484 2024-07-07 19:37:55 +0800
• 74a926324f Merge pull request '敌人范围显示优化' (#9) from dev-0705 into dev-0524 45 2024-07-05 15:12:45 +0800
• 44c639a0b4 敌人范围显示优化 #9 软件204张景程 2024-07-05 15:10:35 +0800
• 571807a930 分离敌人和玩家的高亮标记，优化敌人遍历去重 #8 #6 软件204张景程 2024-07-04 08:27:42 +0800
• 8163cc21a7 Merge pull request '0703BUGFIX' (#7) from dev-0524-0703bugfix into dev-0524 45 2024-07-04 05:31:40 +0800
• e86dd9662a 0703BUGFIX #7 yjm484 2024-07-04 03:15:45 +0800
• 37c534eb04 用户设定忽略 软件204张景程 2024-07-03 18:47:43 +0800
• eeb4bf679f 解决场景冲突 软件204张景程 2024-07-03 18:28:48 +0800
• 96a0ac5629 移除用户设定 软件204张景程 2024-07-03 18:20:07 +0800
• 18d121fee9 删除用户设定追踪 软件204张景程 2024-07-03 18:03:56 +0800
• 8bb583f3fa 修bug 软件204张景程 2024-07-03 01:58:23 +0800
• 0a6b1b66bf Merge pull request '0702BUGFIX' (#5) from dev-0524-bugfix into dev-0524 45 2024-07-03 01:43:13 +0800
• ce443f18e1 0702BUGFIX #5 yjm484 2024-07-02 00:22:13 +0800
• 19d1c04354 加入buff显示 软件204张景程 2024-07-01 23:05:00 +0800
• d18efd8321 敌人顺序行动 软件204张景程 2024-06-30 17:06:33 +0800
• 005b69d9fd 更改git追踪范围 yjm484 2024-06-30 03:25:28 +0800
• 17ebe08ee0 护盾数值联动 软件204张景程 2024-06-28 16:57:31 +0800
• bce81f1cfa 代码合并，卡牌效果和骷髅敌人 软件204张景程 2024-06-28 15:59:09 +0800
• 507d8389a6 忽略修改 软件204张景程 2024-06-28 14:51:25 +0800
• 630b0e0959 0626提交 #4 yjm484 2024-06-26 06:12:12 +0800
• 64f7af91dd 新加入骷髅敌人逻辑 软件204张景程 2024-06-24 20:17:22 +0800
• 80add88b37 优势和卡牌范围 yjm484 2024-06-23 07:42:43 +0800
• 51c7a3f528 卡牌范围和优势 yjm484 2024-06-23 07:40:34 +0800
• 0f8457dbcd 敌人攻击优化 软件204张景程 2024-06-22 10:48:47 +0800
• 3cea0ffae2 第三次合并，卡牌效果和怪物意图 软件204张景程 2024-06-18 10:32:49 +0800
• 06551bfb51 加入了乌鸦AI，优化逻辑 软件204张景程 2024-06-17 05:14:51 +0800
• 6d399474a3 敌人意图优化 软件204张景程 2024-06-16 06:40:33 +0800
• 190480cabe 拖拽方法重构 软件204张景程 2024-06-12 22:05:48 +0800
• 19fc890c09 Merge branch 'dev-0524' into master checkIfPRContentChanged-1752730301603610417/master #3 #2 #153 yjm484 2024-06-11 14:48:18 +0800
• 7741dc4864 Update .gitignore and untrack files checkIfPRContentChanged-1718088198349323294/dev-0611 yjm484 2024-06-11 14:42:44 +0800
• 470124d96e 0611更新 #1 yjm484 2024-06-11 14:28:57 +0800
• e497c47b56 地块数量UI联动，敌人意图优化 checkIfPRContentChanged-1718088198349323294/tmp_dev-0524 checkIfPRContentChanged-1718088198349323294/dev-0524 软件204张景程 2024-06-07 02:28:39 +0800
• bd42f54413 第二次合并代码 软件204张景程 2024-06-04 23:36:05 +0800
• 40157cf2e5 卡牌功能 checkIfPRContentChanged-1718088198349323294/dev-0604 yjm484 2024-06-04 17:41:01 +0800
• 82d100c880 加入场景内UI 软件204张景程 2024-06-03 20:50:29 +0800
• ec3ef9b755 敌人原型逻辑完成 软件204张景程 2024-05-31 11:06:51 +0800
• 9a4508c840 0530 checkIfPRContentChanged-1718088198349323294/dev-0530 yjm484 2024-05-30 21:54:42 +0800
• 4a81487491 加入路障 软件204张景程 2024-05-30 13:30:51 +0800
• 330883c524 怪物A星寻路算法实现 软件204张景程 2024-05-29 19:21:20 +0800
• 55868b0eae 增加Logs忽视 checkIfPRContentChanged-1718088198349323294/dev-0524-test yjm484 2024-05-28 15:57:11 +0800
• 632733ea0d Logs 软件204张景程 2024-05-28 15:52:57 +0800
• a3c4c0a49c 忽略lib 软件204张景程 2024-05-28 15:44:58 +0800
• e9c0f923fc 添加ignore yjm484 2024-05-28 15:26:14 +0800
• 0c864889d7 11 yjm484 2024-05-28 15:24:55 +0800
• 7e404d2977 敌人ai接口实现 checkIfPRContentChanged-1718088198349323294/test_master_2 软件204张景程 2024-05-28 10:05:20 +0800
• 77d3b5fd31 卡牌刷新重复bug修复 软件204张景程 2024-05-26 10:51:19 +0800
• e1c03729db 2024.5.25代码第一次合并读表 软件204张景程 2024-05-25 16:00:13 +0800
• 552d858988 2024.5.24敌人逻辑 软件204张景程 2024-05-24 17:42:37 +0800
• 1a7b6c579c 0524 yjm484 2024-05-24 17:20:57 +0800
• 5860de5851 2024.5.23ui联动和优化 软件204张景程 2024-05-23 13:01:00 +0800
• ce348005e3 2024.5.20UI数值联动 软件204张景程 2024-05-20 09:52:19 +0800
• 7ff155badd 分支提交 软件204张景程 2024-05-13 20:50:59 +0800
• 1727177a5d 游戏工程文件2024-5-13，加入了简单UI和卡组循环 checkIfPRContentChanged-1718088198349323294/master 软件204张景程 2024-05-13 19:42:28 +0800
• 34a1429bfd 工程文件2024-5-13，加入了简单UI和卡组抽卡循环 软件204张景程 2024-05-13 07:14:10 +0800
• 1bda5c6669 游戏工程文件2024-5-10 软件204张景程 2024-05-10 19:21:10 +0800
• 4f6881b63b test 软件204张景程 2024-05-10 19:07:49 +0800
• 3dce91300e Initial commit 45 2024-05-10 18:57:13 +0800