Commit Graph

Select branches

Hide Pull Requests

2.4.6

JIJI-0.4.0

gujiji

liuyun

master

maybe0.6.0

package_530

release-p3-h0.7.0

release-p3-h0.8.0

release_520_0.1.0

release_6.1_0.6.0

test0.6.0

zhuguoqing/dev-v3

zhuguoqing/dev-v4

0.1.0

0.2.0

0.3.0

0.8.0

5.26-0.2.0

5.26-0.3.0

5.27-0.4.0

5.27-0.5.0

6.1-0.6.0

6.8-0.7.0

new-version-0.1.0

package-0.3.0-hotfix-0.7.0

package_0.2.0_hotfix_0.6.0

Mono Color

• 1404327eba 升级引擎 2.4.6 bingshi 2022-06-22 14:59:04 +08:00
• ed7527a93c tmp bingshi 2022-06-17 11:12:28 +08:00
• bc2c1a9b5f Merge branch 'release-p3-h0.8.0' master zhuguoqing 2022-06-16 19:14:19 +08:00
• d1234216f3 update release-p3-h0.8.0 guoqing.zhu 2022-06-16 16:47:59 +08:00
• e15774ba3b add lock guoqing.zhu 2022-06-16 16:10:45 +08:00
• 2181830443 update 0.8.0 release-p3-h0.7.0 guoqing.zhu 2022-06-16 11:41:35 +08:00
• e8714ca28a update guoqing.zhu 2022-06-16 00:37:43 +08:00
• 68de92abde tmp guoqing.zhu 2022-06-15 22:32:47 +08:00
• c221f3bb7b up guoqing.zhu 2022-06-15 22:14:13 +08:00
• 956ab297c7 updat guoqing.zhu 2022-06-15 20:07:36 +08:00
• e40560f91a ip guoqing.zhu 2022-06-15 18:55:17 +08:00
• 37a463071d update guoqing.zhu 2022-06-15 18:45:28 +08:00
• d9fe892303 update zhuguoqing/dev-v4 guoqing.zhu 2022-06-15 18:43:29 +08:00
• fe996c6a49 update guoqing.zhu 2022-06-15 18:24:49 +08:00
• 59f030c02b Merge remote-tracking branch 'origin/liuyun' into zhuguoqing/dev-v4 guoqing.zhu 2022-06-15 18:16:55 +08:00
• d7404cf24e Update JIJIJI.fire liuyun lyunpicq 2022-06-15 18:16:00 +08:00
• ea31b59d96 Merge remote-tracking branch 'origin/liuyun' into zhuguoqing/dev-v4 guoqing.zhu 2022-06-15 18:14:11 +08:00
• 346db058b3 UPDATE guoqing.zhu 2022-06-15 18:13:33 +08:00
• 499bed03a9 update guoqing.zhu 2022-06-15 18:09:05 +08:00
• f95084e1b4 START动画放在JIJI场景内了 lyunpicq 2022-06-15 17:54:46 +08:00
• 7db5e56e83 ddd lyunpicq 2022-06-15 17:04:14 +08:00
• 32b84ca5fb Merge remote-tracking branch 'origin/liuyun' into zhuguoqing/dev-v4 guoqing.zhu 2022-06-15 16:44:42 +08:00
• 4e9841058b add guoqing.zhu 2022-06-15 16:43:14 +08:00
• 87cb77eed1 Merge branch 'zhuguoqing/dev-v4' of git.kingsome.cn:client/pubgv3 into zhuguoqing/dev-v4 guoqing.zhu 2022-06-15 16:39:41 +08:00
• 80d538ee33 update guoqing.zhu 2022-06-15 16:39:32 +08:00
• e98ff50064 Update UIMain.prefab guyuanji 2022-06-15 16:20:19 +08:00
• bfdc4f0212 update guoqing.zhu 2022-06-15 16:12:58 +08:00
• d417c2011e Update gameConfig.js guyuanji 2022-06-15 14:11:06 +08:00
• 6488975533 介面更新 guyuanji 2022-06-15 13:29:25 +08:00
• caf9d5bcc0 按钮位置交换 guyuanji 2022-06-15 12:30:17 +08:00
• 3e33b8a5f9 add btns guoqing.zhu 2022-06-15 12:25:22 +08:00
• 6889403deb update guoqing.zhu 2022-06-15 12:22:35 +08:00
• f862d42b13 add upfailed guoqing.zhu 2022-06-15 11:04:13 +08:00
• 4c3bc991e2 update guoqing.zhu 2022-06-14 20:30:09 +08:00
• 182d1a2d17 Update ChooseHeroUpQuality.ts guoqing.zhu 2022-06-14 18:17:26 +08:00
• 8c5274d7ee update guoqing.zhu 2022-06-14 18:09:12 +08:00
• 1fff1f5300 LEVELUP升级动画上传 lyunpicq 2022-06-14 18:00:37 +08:00
• 0901a1fc74 maybefinish guoqing.zhu 2022-06-14 17:52:26 +08:00
• a3d3ca4fd1 LEVELUP 升级动画 lyunpicq 2022-06-14 17:28:14 +08:00
• 35cc8c1f1e update guoqing.zhu 2022-06-14 17:06:30 +08:00
• 9548e977ee update hero ifo guoqing.zhu 2022-06-14 16:38:59 +08:00
• ae0603f56f update guoqing.zhu 2022-06-14 16:23:36 +08:00
• 78d2332e18 进阶动画 lyunpicq 2022-06-14 16:19:11 +08:00
• ae96f420a4 Merge branch 'zhuguoqing/dev-v4' of git.kingsome.cn:client/pubgv3 into zhuguoqing/dev-v4 guoqing.zhu 2022-06-14 14:29:57 +08:00
• 12bd005c91 Update gameConfig.js guoqing.zhu 2022-06-14 14:29:49 +08:00
• b2d4949a11 shop guyuanji 2022-06-14 14:29:15 +08:00
• 067c712f62 udpate guoqing.zhu 2022-06-14 13:51:53 +08:00
• dbefb6b187 Merge branch 'JIJI-0.4.0' into zhuguoqing/dev-v4 guoqing.zhu 2022-06-14 12:02:26 +08:00
• 731884fd53 1 JIJI-0.4.0 guyuanji 2022-06-14 12:01:44 +08:00
• f0dae71efa Merge branch 'JIJI-0.4.0' into zhuguoqing/dev-v4 guoqing.zhu 2022-06-14 11:35:07 +08:00
• 9fdc962809 update guoqing.zhu 2022-06-14 11:32:52 +08:00
• 461874ed58 1 guyuanji 2022-06-14 10:28:49 +08:00
• dc9deefacb updarte guoqing.zhu 2022-06-13 23:28:54 +08:00
• 11e2bde915 update guoqing.zhu 2022-06-13 20:27:21 +08:00
• caad051e47 add new ui guoqing.zhu 2022-06-10 19:40:58 +08:00
• f972b76834 1 guyuanji 2022-06-10 19:37:00 +08:00
• 0e9b90ba59 START增加循环动画 lyunpicq 2022-06-10 19:22:09 +08:00
• 198acb7b23 tmp lyunpicq 2022-06-10 11:00:36 +08:00
• b006dd2ae4 add guoqing.zhu 2022-06-09 15:11:37 +08:00
• 9e32a172db Merge branch 'zhuguoqing/dev-v4' into JIJI-0.4.0 guoqing.zhu 2022-06-09 14:47:03 +08:00
• ccf2d9206a 1 guyuanji 2022-06-09 14:37:14 +08:00
• 786d387ef9 tmp maybe0.6.0 zhuguoqing 2022-06-09 13:27:11 +08:00
• 6bb128f74c add update tips test0.6.0 zhuguoqing 2022-06-09 11:27:32 +08:00
• e452bbff63 Update pb_update.prefab guyuanji 2022-06-09 06:26:27 +08:00
• 5e09d23570 pb update guyuanji 2022-06-09 06:21:46 +08:00
• 3af69ab5e0 Update Config.js package-0.3.0-hotfix-0.7.0 zhuguoqing 2022-06-09 06:20:12 +08:00
• e63356d2e4 Merge branch 'zhuguoqing/dev-v4' of http://git.kingsome.cn/client/pubgv3 into zhuguoqing/dev-v4 zhuguoqing 2022-06-09 05:46:17 +08:00
• 717eedcdbb update guoqing.zhu 2022-06-09 05:45:35 +08:00
• 57fe292aaf update zhuguoqing 2022-06-09 05:26:39 +08:00
• f08e2de5d7 update guoqing.zhu 2022-06-09 03:38:39 +08:00
• adc55b3cc1 update zhuguoqing/dev-v3 zhuguoqing 2022-06-09 03:07:15 +08:00
• 89cbcfc4fe 1 guyuanji 2022-06-09 00:09:09 +08:00
• eb4664c755 1 guyuanji 2022-06-08 17:54:05 +08:00
• 0e6f3eb56e Update LoginScene.fire guoqing.zhu 2022-06-08 13:33:38 +08:00
• 8b6e439923 Update version_generator.js guoqing.zhu 2022-06-08 13:31:20 +08:00
• 59ab9ff884 update guoqing.zhu 2022-06-08 11:33:55 +08:00
• 50da32dfd6 update release_6.1_0.6.0 guoqing.zhu 2022-06-08 11:09:08 +08:00
• ee98fc3fae Merge branch 'zhuguoqing/dev-v3' into release_6.1_0.6.0 guoqing.zhu 2022-06-08 11:04:58 +08:00
• a99e979df9 Update UIGuninfo.prefab 6.8-0.7.0 guoqing.zhu 2022-06-07 19:43:37 +08:00
• 6a2a9468db update guoqing.zhu 2022-06-07 19:37:47 +08:00
• beec0fdc73 add switch guoqing.zhu 2022-06-07 18:56:59 +08:00
• a13de8a8b0 Update BaseNet.js guoqing.zhu 2022-06-07 18:10:29 +08:00
• e39228d642 updare guoqing.zhu 2022-06-07 18:09:13 +08:00
• 4ef8f4da4a update guoqing.zhu 2022-06-07 18:04:19 +08:00
• 2b32047de2 finish0.7.0 guoqing.zhu 2022-06-07 17:59:00 +08:00
• 03b6067db6 update guoqing.zhu 2022-06-07 17:27:33 +08:00
• 5496a638bb fix guoqing.zhu 2022-06-07 17:02:08 +08:00
• 5f057b3ae8 update guoqing.zhu 2022-06-07 16:55:03 +08:00
• 62270ac449 update guoqing.zhu 2022-06-07 16:34:49 +08:00
• 0c7acd00b4 update guoqing.zhu 2022-06-07 16:11:18 +08:00
• 2f6f49cb06 updateUI guoqing.zhu 2022-06-07 15:34:20 +08:00
• 5849129427 update guoqing.zhu 2022-06-07 15:09:55 +08:00
• 805b3bb2ef 介面优化debug guyuanji 2022-06-07 14:39:56 +08:00
• 99912c8be7 update guoqing.zhu 2022-06-07 14:07:58 +08:00
• 54b8b993f2 Merge branch 'zhuguoqing/dev-v3' of git.kingsome.cn:client/pubgv3 into zhuguoqing/dev-v3 guyuanji 2022-06-07 14:01:27 +08:00
• 94ec29b1ac updatye guoqing.zhu 2022-06-07 13:58:13 +08:00
• 3afe33db47 悬赏派遣介面更新 guyuanji 2022-06-07 13:57:23 +08:00
• 2cebeacf6c update guoqing.zhu 2022-06-07 13:23:13 +08:00
• a941f317bc update guoqing.zhu 2022-06-07 13:14:57 +08:00
• e2b989e7f1 Merge branch 'zhuguoqing/dev-v3' of git.kingsome.cn:client/pubgv3 into zhuguoqing/dev-v3 guoqing.zhu 2022-06-07 12:47:01 +08:00